[PATCH 097/144] Avoid inheritance from std::vector in ParallelRegion class.

Use composition instead of inheritance.

Gbp-Pq: Name 0097-Avoid-inheritance-from-std-vector-in-ParallelRegion-.patch

diff --git a/lib/llvmopencl/ParallelRegion.cc b/lib/llvmopencl/ParallelRegion.cc
index 9f7e8f4a9d337d824ec2e9ea1e51923282373914..d86a17f111f9fcf5c78448dba01aa123d3476dc6 100644 (file)
--- a/lib/llvmopencl/ParallelRegion.cc
+++ b/lib/llvmopencl/ParallelRegion.cc
@@ -55,8 +55,7 @@ using namespace pocl;
 
 int ParallelRegion::idGen = 0;
 
-ParallelRegion::ParallelRegion(int forcedRegionId) : 
-  std::vector<llvm::BasicBlock *>(), 
+ParallelRegion::ParallelRegion(int forcedRegionId) :
   LocalIDXLoadInstr(NULL), LocalIDYLoadInstr(NULL), LocalIDZLoadInstr(NULL),
   exitIndex_(0), entryIndex_(0), pRegionId(forcedRegionId)
 {

diff --git a/lib/llvmopencl/ParallelRegion.h b/lib/llvmopencl/ParallelRegion.h
index 4e359068e677ce429de578f1e6f0e23d384a91ec..7662b79d4e6a36d0fff94cea4ee2e57f45e13e85 100644 (file)
--- a/lib/llvmopencl/ParallelRegion.h
+++ b/lib/llvmopencl/ParallelRegion.h
@@ -1,18 +1,18 @@
 // Class definition for parallel regions, a group of BasicBlocks that
 // each kernel should run in parallel.
-// 
+//
 // Copyright (c) 2011 Universidad Rey Juan Carlos
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -45,15 +45,44 @@ namespace pocl {
 
 class Kernel;
 
-  // TODO Cleanup: this should not inherit vector but contain it.
-  // It now exposes too much to the clients and leads to hard
-  // to track errors when the API is changed.
-  class ParallelRegion : public std::vector<llvm::BasicBlock *> {    
+  class ParallelRegion {
+  private:
+    using BBContainer = std::vector<llvm::BasicBlock *>;
+
   public:
     typedef llvm::SmallVector<ParallelRegion *, 8> ParallelRegionVector;
 
+    using iterator = BBContainer::iterator;
+    using const_iterator = BBContainer::const_iterator;
+
     ParallelRegion(int forcedRegionId=-1);
 
+    iterator begin() { return BBs_.begin(); }
+    iterator end() { return BBs_.end(); }
+
+    const_iterator begin() const { return BBs_.begin(); }
+    const_iterator end() const { return BBs_.end(); }
+
+    llvm::BasicBlock *front() { return BBs_.front(); }
+    llvm::BasicBlock *back() { return BBs_.back(); }
+
+    llvm::BasicBlock *at(size_t index) { return BBs_.at(index); }
+    llvm::BasicBlock *operator[](size_t index) { return BBs_[index]; }
+
+    std::size_t size() const { return BBs_.size(); }
+    bool empty() const { return BBs_.empty(); }
+
+    void push_back(llvm::BasicBlock *BB) { BBs_.push_back(BB); }
+
+    void insert(const_iterator pos, llvm::BasicBlock *BB) {
+      BBs_.insert(pos, BB);
+    }
+
+    template <typename InIteratorT>
+    void insert(const_iterator pos, InIteratorT first, InIteratorT last) {
+      BBs_.insert(pos, first, last);
+    }
+
     /* BarrierBlock *getEntryBarrier(); */
     ParallelRegion *replicate(llvm::ValueToValueMapTy &map,
                               const llvm::Twine &suffix);
@@ -75,9 +104,9 @@ class Kernel;
 
     llvm::BasicBlock* exitBB() { return at(exitIndex_); }
     llvm::BasicBlock* entryBB() { return at(entryIndex_); }
-    void AddIDMetadata(llvm::LLVMContext& context, 
-                       std::size_t x = 0, 
-                       std::size_t y = 0, 
+    void AddIDMetadata(llvm::LLVMContext& context,
+                       std::size_t x = 0,
+                       std::size_t y = 0,
                        std::size_t z = 0);
 
     void AddParallelLoopMetadata
@@ -94,7 +123,7 @@ class Kernel;
          std::vector<llvm::Value*>& params);
 
     static ParallelRegion *
-      Create(const llvm::SmallPtrSet<llvm::BasicBlock *, 8>& bbs, 
+      Create(const llvm::SmallPtrSet<llvm::BasicBlock *, 8>& bbs,
              llvm::BasicBlock *entry, llvm::BasicBlock *exit);
 
     static void GenerateTempNames(llvm::BasicBlock *bb);
@@ -108,6 +137,8 @@ class Kernel;
     int GetID() const { return pRegionId; }
 
   private:
+    BBContainer BBs_;
+
     llvm::Instruction* LocalIDXLoadInstr;
     llvm::Instruction* LocalIDYLoadInstr;
     llvm::Instruction* LocalIDZLoadInstr;
@@ -123,7 +154,7 @@ class Kernel;
     static int idGen;
 
   };
-    
+
 }
-                              
+
 #endif